Skip to content

d_a_npc_impal work#2449

Merged
hatal175 merged 3 commits intozeldaret:mainfrom
hev7:d_a_npc_impal
May 19, 2025
Merged

d_a_npc_impal work#2449
hatal175 merged 3 commits intozeldaret:mainfrom
hev7:d_a_npc_impal

Conversation

@hev7
Copy link
Copy Markdown
Contributor

@hev7 hev7 commented May 18, 2025

No description provided.

@decomp-dev
Copy link
Copy Markdown

decomp-dev bot commented May 18, 2025 •
edited
Loading

Report for GZ2E01 (9ffb520 - 8140d17)

📈 Matched code: 60.71% (+0.16%, +18888 bytes)

✅ d_a_npc_ash/d/actor/d_a_npc_ash | daNpcAsh_c::setMotionAnm(int, float) +16 bytes -> 100.00%
✅ d_a_npc_ashB/d/actor/d_a_npc_ashB | daNpcAshB_c::setMotionAnm(int, float) +25 bytes -> 100.00%
✅ d_a_npc_ashB/d/actor/d_a_npc_ashB | daNpcAshB_c::main() +12 bytes -> 100.00%
📈 d_a_npc_ashB/d/actor/d_a_npc_ashB | daNpcAshB_c::lookat() +8 bytes -> 95.28%
📈 d_a_npc_impal/d/actor/d_a_npc_impal | daNpcImpal_c::daNpcImpal_c() +104 bytes -> 37.32%
✅ d_a_npc_impal/d/actor/d_a_npc_impal | cM3dGCyl::~cM3dGCyl() +68 bytes -> 100.00%
✅ d_a_npc_impal/d/actor/d_a_npc_impal | cM3dGAab::~cM3dGAab() +68 bytes -> 100.00%
✅ d_a_npc_impal/d/actor/d_a_npc_impal | daNpcImpal_c::~daNpcImpal_c() +369 bytes -> 100.00%
✅ d_a_npc_impal/d/actor/d_a_npc_impal | daNpcImpal_c::Create() +816 bytes -> 100.00%
✅ d_a_npc_impal/d/actor/d_a_npc_impal | daNpcImpal_c::CreateHeap() +620 bytes -> 100.00%
✅ d_a_npc_impal/d/actor/d_a_npc_impal | J3DTevKColorAnm::~J3DTevKColorAnm() +56 bytes -> 100.00%
✅ d_a_npc_impal/d/actor/d_a_npc_impal | J3DTevKColorAnm::J3DTevKColorAnm() +20 bytes -> 100.00%
✅ d_a_npc_impal/d/actor/d_a_npc_impal | J3DTevColorAnm::~J3DTevColorAnm() +56 bytes -> 100.00%
✅ d_a_npc_impal/d/actor/d_a_npc_impal | J3DTevColorAnm::J3DTevColorAnm() +20 bytes -> 100.00%
✅ d_a_npc_impal/d/actor/d_a_npc_impal | J3DTexNoAnm::~J3DTexNoAnm() +68 bytes -> 100.00%
✅ d_a_npc_impal/d/actor/d_a_npc_impal | J3DTexNoAnm::J3DTexNoAnm() +32 bytes -> 100.00%
✅ d_a_npc_impal/d/actor/d_a_npc_impal | J3DTexMtxAnm::~J3DTexMtxAnm() +56 bytes -> 100.00%
✅ d_a_npc_impal/d/actor/d_a_npc_impal | J3DTexMtxAnm::J3DTexMtxAnm() +20 bytes -> 100.00%
✅ d_a_npc_impal/d/actor/d_a_npc_impal | J3DMatColorAnm::~J3DMatColorAnm() +56 bytes -> 100.00%
✅ d_a_npc_impal/d/actor/d_a_npc_impal | J3DMatColorAnm::J3DMatColorAnm() +20 bytes -> 100.00%
✅ d_a_npc_impal/d/actor/d_a_npc_impal | daNpcImpal_c::Delete() +48 bytes -> 100.00%
✅ d_a_npc_impal/d/actor/d_a_npc_impal | daNpcImpal_c::Execute() +32 bytes -> 100.00%
✅ d_a_npc_impal/d/actor/d_a_npc_impal | daNpcImpal_c::Draw() +108 bytes -> 100.00%
✅ d_a_npc_impal/d/actor/d_a_npc_impal | daNpcImpal_c::ctrlJoint(J3DJoint*, J3DModel*) +461 bytes -> 100.00%
✅ d_a_npc_impal/d/actor/d_a_npc_impal | daNpcImpal_c::createHeapCallBack(fopAc_ac_c*) +28 bytes -> 100.00%
✅ d_a_npc_impal/d/actor/d_a_npc_impal | daNpcImpal_c::ctrlJointCallBack(J3DJoint*, int) +73 bytes -> 100.00%
✅ d_a_npc_impal/d/actor/d_a_npc_impal | daNpcImpal_c::setExpressionAnm(int, bool) +572 bytes -> 100.00%
✅ d_a_npc_impal/d/actor/d_a_npc_impal | daNpcImpal_c::setExpressionBtp(int) +220 bytes -> 100.00%
✅ d_a_npc_impal/d/actor/d_a_npc_impal | daNpcImpal_c::setMotionAnm(int, float) +368 bytes -> 100.00%
✅ d_a_npc_impal/d/actor/d_a_npc_impal | daNpcImpal_c::reset() +505 bytes -> 100.00%
...and 42 more items

hatal175
hatal175 reviewed May 19, 2025
View reviewed changes
include/d/actor/d_a_npc_impal.h Outdated
/* 0xDE6 */ u16 mMode;
/* 0xDE8 */ u8 field_0xde8;
/* 0xDE9 */ u8 field_0xde9;
/* 0xDEA */ u8 field_0xdea[0xdec - 0xdea];
Copy link
Copy Markdown
Contributor

@hatal175 hatal175 May 19, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this padding needed?

Copy link
Copy Markdown
Contributor Author

@hev7 hev7 May 19, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks, removed this

src/d/actor/d_a_npc_impal.cpp Outdated
s16 angle_delta = mCurAngle.y - mOldAngle.y;

cXyz lookat_pos[3] = {mLookatPos[0], mLookatPos[1], mLookatPos[2]};
// csXyz** lookat_angle = getLookatAngle();
Copy link
Copy Markdown
Contributor

@hatal175 hatal175 May 19, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Comment?

Copy link
Copy Markdown
Contributor Author

@hev7 hev7 May 19, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This was my attempt at fixing an issue with literals. I was able to get rodata to fully match, but the lookat function still didn't match, so I left it commented out.

I've just removed it in the latest commit.

@hatal175 hatal175 merged commit 84c616d into zeldaret:main May 19, 2025
1 check passed
meintte pushed a commit to meintte/tp that referenced this pull request May 28, 2025
@hev7 @meintte
d_a_npc_impal work (zeldaret#2449)
3063324 
* d_a_npc_impal work

* Address review comments
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@hatal175 hatal175 hatal175 approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@hev7 @hatal175